use PANGO_PIXELS() to convert to pixels

2000-11-14  Havoc Pennington  <hp@pobox.com>

* gtk/gtktextlayout.c (add_cursor): use PANGO_PIXELS() to convert
to pixels

diff --git a/ChangeLog b/ChangeLog
index 267e70929a8310aac8766c0e592f9a4591505509..553666ae9690e4cf8eaf377acc37ff48ec624d41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-14  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextlayout.c (add_cursor): use PANGO_PIXELS() to convert
+       to pixels
+
 2000-11-14  Havoc Pennington  <hp@pobox.com>
 
        * gtk/testtextbuffer.c (fill_buffer): change "offset" to "rise"

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 267e70929a8310aac8766c0e592f9a4591505509..553666ae9690e4cf8eaf377acc37ff48ec624d41 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2000-11-14  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextlayout.c (add_cursor): use PANGO_PIXELS() to convert
+       to pixels
+
 2000-11-14  Havoc Pennington  <hp@pobox.com>
 
        * gtk/testtextbuffer.c (fill_buffer): change "offset" to "rise"

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 267e70929a8310aac8766c0e592f9a4591505509..553666ae9690e4cf8eaf377acc37ff48ec624d41 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2000-11-14  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextlayout.c (add_cursor): use PANGO_PIXELS() to convert
+       to pixels
+
 2000-11-14  Havoc Pennington  <hp@pobox.com>
 
        * gtk/testtextbuffer.c (fill_buffer): change "offset" to "rise"

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 267e70929a8310aac8766c0e592f9a4591505509..553666ae9690e4cf8eaf377acc37ff48ec624d41 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2000-11-14  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextlayout.c (add_cursor): use PANGO_PIXELS() to convert
+       to pixels
+
 2000-11-14  Havoc Pennington  <hp@pobox.com>
 
        * gtk/testtextbuffer.c (fill_buffer): change "offset" to "rise"

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 267e70929a8310aac8766c0e592f9a4591505509..553666ae9690e4cf8eaf377acc37ff48ec624d41 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2000-11-14  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextlayout.c (add_cursor): use PANGO_PIXELS() to convert
+       to pixels
+
 2000-11-14  Havoc Pennington  <hp@pobox.com>
 
        * gtk/testtextbuffer.c (fill_buffer): change "offset" to "rise"

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 267e70929a8310aac8766c0e592f9a4591505509..553666ae9690e4cf8eaf377acc37ff48ec624d41 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2000-11-14  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextlayout.c (add_cursor): use PANGO_PIXELS() to convert
+       to pixels
+
 2000-11-14  Havoc Pennington  <hp@pobox.com>
 
        * gtk/testtextbuffer.c (fill_buffer): change "offset" to "rise"

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 267e70929a8310aac8766c0e592f9a4591505509..553666ae9690e4cf8eaf377acc37ff48ec624d41 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2000-11-14  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextlayout.c (add_cursor): use PANGO_PIXELS() to convert
+       to pixels
+
 2000-11-14  Havoc Pennington  <hp@pobox.com>
 
        * gtk/testtextbuffer.c (fill_buffer): change "offset" to "rise"

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index fe0cb36fa12f1fe3fda001288b2a706c9895e222..fe5cbf31dcd55239ca6e727f1534128bbd8f0f5e 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1415,9 +1415,9 @@ add_cursor (GtkTextLayout      *layout,
 
   cursor = g_new (GtkTextCursorDisplay, 1);
 
-  cursor->x = strong_pos.x / PANGO_SCALE;
-  cursor->y = strong_pos.y / PANGO_SCALE;
-  cursor->height = strong_pos.height / PANGO_SCALE;
+  cursor->x = PANGO_PIXELS (strong_pos.x);
+  cursor->y = PANGO_PIXELS (strong_pos.y);
+  cursor->height = PANGO_PIXELS (strong_pos.height);
   cursor->is_strong = TRUE;
   display->cursors = g_slist_prepend (display->cursors, cursor);
 
@@ -1429,9 +1429,9 @@ add_cursor (GtkTextLayout      *layout,
 
       cursor = g_new (GtkTextCursorDisplay, 1);
 
-      cursor->x = weak_pos.x / PANGO_SCALE;
-      cursor->y = weak_pos.y / PANGO_SCALE;
-      cursor->height = weak_pos.height / PANGO_SCALE;
+      cursor->x = PANGO_PIXELS (weak_pos.x);
+      cursor->y = PANGO_PIXELS (weak_pos.y);
+      cursor->height = PANGO_PIXELS (weak_pos.height);
       cursor->is_strong = FALSE;
       cursor->is_weak = TRUE;
       display->cursors = g_slist_prepend (display->cursors, cursor);
@@ -1510,6 +1510,9 @@ add_preedit_attrs (GtkTextLayout     *layout,
            case PANGO_ATTR_STRIKETHROUGH:
              appearance.strikethrough = ((PangoAttrInt *)attr)->value;
              break;
+            case PANGO_ATTR_RISE:
+              appearance.rise = ((PangoAttrInt *)attr)->value;
+              break;
            default:
              break;
            }